GtkColorChooserDialog: make alternative button order work
authorMatthias Clasen <mclasen@redhat.com>
Thu, 21 Mar 2013 02:38:36 +0000 (22:38 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 21 Mar 2013 04:00:19 +0000 (00:00 -0400)
The alternative button order that we set did not actually
work, since the ok button did not have a response id.
Partial fix for
https://bugzilla.gnome.org/show_bug.cgi?id=695493

gtk/gtkcolorchooserdialog.c

index 261035473922e055cf8a1b5f242ede64bde5e061..fcde97fd321bdbd55cb64af1010ab4313cfdc32b 100644 (file)
@@ -96,7 +96,6 @@ selected_cb (GtkButton *button,
              GtkDialog *dialog)
 {
   save_color (GTK_COLOR_CHOOSER_DIALOG (dialog));
-  gtk_dialog_response (dialog, GTK_RESPONSE_OK);
 }
 
 static void
@@ -152,8 +151,7 @@ gtk_color_chooser_dialog_init (GtkColorChooserDialog *cc)
                     G_CALLBACK (selected_cb), dialog);
   gtk_widget_set_can_default (priv->select_button, TRUE);
   gtk_widget_show (priv->select_button);
-  gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (dialog)),
-                    priv->select_button, FALSE, TRUE, 0);
+  gtk_dialog_add_action_widget (dialog, priv->select_button, GTK_RESPONSE_OK);
   gtk_widget_grab_default (priv->select_button);
 
   gtk_dialog_set_alternative_button_order (dialog,